Moved block and mode to control class