Reimplemented the time offset correctly