CFGU: Addressed some comments.