Update control

fixing merge issue