Have on demand gas water heater (Calorex) but long ways from bath tub. Am sure much heat is lost in pipes with this cold weather. Am sure othershave had same problem. What solutions have worked? Bigger on-demand gas, electric booster near tub, something else?