Refactored physics