Refactored to Furnace