Zr_original removed, rot_rel_time refactor