Fixed up, now accounts for millisecond timestamps