support for different timezones (and got rid of nastiness