bolstering timezone support