Latest try to get memory usage down