Refactored physics circle
Refactored convert units