Add controlable block
Refactoring commit