Adding some features to the control assignment.