cleanup, implementing slight modification to physics