merged physics
physics working