Gravity & Friction improved