changes from meeting
merge