Gravity handling seems okay now