Update to better manage Heating Waiting times