Proposal: Addressed cfsworks comments on aa1d2a7