Revert "Revert "Revert "add Control"""

This reverts commit bcef6dcadcb3c277cb65c4bbb81e67c1b229b40a.