updated physics class
Merge