Update controls (6/20)

Update controls