Further debugging of the rotation issues