Improved the Engine Room