Tank or tank-less water heaters