Remaining changes to control condition

These are the changes made to the control condition after the first pull request.
Did we take out the ungroup steps? Or why are we ignoring them now?