Fixed physics. No merging due to refactoring being in progress