Updated settings, less memory usage