Elevator further changes