improved DoorEventHandling