changes from feedback