made changes from Jim's comments