[one more] Reduce memory usage and improve performance.