adds some timezone handling