Reduced memory usage by an order of magnitude