More work on the elevator for 2.4.5.