Improve optimization for speed up rotations (use CD)