Continuing rework on the rotation + improvements on handler behaviors