renamed and added comments to address Wills comments