Last interaction changes
merge