Rotation improved + scale