Remaining changes to control condition

These are the changes made to the control condition after the first pull request.
Is this comment still valid? If not, should be removed, or modified.