diff --git a/motion_light_mod.yaml b/motion_light_mod.yaml
index 3e986dc..c40fc27 100644
--- a/motion_light_mod.yaml
+++ b/motion_light_mod.yaml
@@ -1,15 +1,15 @@
 blueprint:
-  name: Motion-activated Light Modified
-  description: Turn on a light when motion/occupancy is detected.
+  name: Motion-activated Light by occupancy
+  description: Turn on a light when occupancy is detected.
   domain: automation
   source_url: https://gitea.rockhost.se/Piteball/ha-blueprints/_edit/master/motion_light_mod.yaml
   input:
     motion_entity:
-      name: Motion Sensor
+      name: Occupancy Sensor
       selector:
         entity:
           domain: binary_sensor
-          device_class: motion
+          device_class: occupancy
     light_target:
       name: Light
       selector:
@@ -34,8 +34,8 @@ max_exceeded: silent
 trigger:
   platform: state
   entity_id: !input motion_entity
-  from: "off"
-  to: "on"
+  from: "empty"
+  to: "detected"
 
 action:
   - service: light.turn_on
@@ -43,8 +43,8 @@ action:
   - wait_for_trigger:
       platform: state
       entity_id: !input motion_entity
-      from: "on"
-      to: "off"
+      from: "detected"
+      to: "empty"
   - delay: !input no_motion_wait
   - service: light.turn_off
     target: !input light_target
\ No newline at end of file