Improved physics

Improved physics