change to new control model.

FYI
adjust block.

FYI