Big improvement in memory usage