ControlView changes added