some more changes from meeting