it should be more memory efficient now?