More changes to improve memory usage during rotation
2 files changed