Memory management slightly improved