made changes from meeting with Umut