improve time zone switch