some changes: less slides + Craig's points
no slide for dropoff
merge