Update to use ALL HOURS EXTRACT