Addressed some of Bill's comments