Re-factor for clarity, Elevator moves.