Improved mechanics