Added code to to time zone calculations