working on timezone fix