changes from second feedback