OE heater hose swap out is a good idea, yes.