Further adjustments to save memory
5 files changed