Improved Mechanics a bit