Update controls (18/20)

Update controls