Physics is fixed
Merged