Incorporated some of Roger's comments