Switch to a more maintainable gravity model