inroads towards better timezone support