Made even more memory efficient