memory changes
memory fixes