Update controlMode logic to new standard