replaced manual timezone correction with built in solution