Machinery enhancements