added Xiaoli's gumballmachine model and relocated other objects to fit better