added time zone
Merge branch 'master' into prod
removed extra bits