go on refactor physics part