Use the new smart rotate