reverted back to Chenyu's code for fixing the timezone