1.60.7.3.3 - reduced memory usage