rotation fixed
merged after housekeeping