Improved RAM usage