UPDATED Amusement Park Physics 3-11-17