Adjustments to save memory.