memory improvements
memory improvements