Adapt to new rotation method