Updated control schemes