Redesigning proper rewind mechanics