commited changes from last week meeting