Initial attempts to improve memory usage