Revert "Revert "add Control""

This reverts commit 506d19a7650e20ab1d8d247c8361e7d5f112d9f9.