Updated to handle timezones better
Updated for the time_of_day field setting to work properly