More memory optimization.