added friction and air resistance