More improvements to rotation