Fixed position calcuation, added time resetter