Updated to remove unnecessary boiler