added handling of timezones