Remaining changes to control condition

These are the changes made to the control condition after the first pull request.
Same as above.