changed the logic behind tz