Committing changes from r7 comments