fixed loading and added elevators