changes from discussion