changed timezone logic