Make it more memory efficient