Adds better gravity management