Memory improvements 2.