added better timezone support