more memories and modal changes
merge conflict