Made PU more memory efficient