diff --git a/data/stage1.lua b/data/stage1.lua
index de329ae..33fe4c6 100644
--- a/data/stage1.lua
+++ b/data/stage1.lua
@@ -142,6 +142,7 @@ function stages.stage1_init()
 
     local abad_x, abad_y = coords.room_to_world ( 10, 4, 3 )
     -- local abad_x, abad_y = coords.room_to_world ( 54, 8, 3 )
+    local abad_x, abad_y = coords.room_to_world ( 18, 9, 3 )
     
     abad:move(abad_x, abad_y)
     abad_make_safe( true )
diff --git a/data/trigger.lua b/data/trigger.lua
index 3079f11..1191e65 100644
--- a/data/trigger.lua
+++ b/data/trigger.lua
@@ -24,7 +24,13 @@ function trigger.new(_hab,_x,_y,_action,_escena,_id,_type,_doors,_linked_id)
         enabled=true,
         disable_reason="",
         bb=_bb,
-        open_door=triggers.open_door }
+        run=trigger.run }
+end
+
+function trigger:run()
+    if self.fun ~= nil then
+        self:fun()
+    end
 end
 
 function trigger:update()
@@ -118,12 +124,12 @@ function triggers:escena_abad_porta_batman()
 end
 
 function triggers:escena_habitacio_batman()
-    if abad.objects.clau_premiere~=nil and 
-       abad.objects.clau_elalien~=nil 
+    if abad.objects.clau_premiere==nil and 
+       abad.objects.clau_elalien==nil 
     then
         -- switches.start(0,0)
-        local trigger = trigger.new(abad.hab,1,1,nil,"","porta acces cacaus","",{20, 53,41})
-        trigger:open_door()
+        local trigger_porta = trigger.new(abad.hab,1,1,triggers.open_door,"switch","porta acces cacaus","",{20, 53,41})
+        trigger_porta:run()
         bol.furtat=true
         abad.objects.clau_premiere=nil
         abad.objects.clau_elalien=nil