Addressed feedback from comment #12, please review