Improve elevators even further