Drastically improved memory usage