Incorporated some of Stephen's comments.