improved the handling of the hourly stuff