changes to improve memory changes