Updated control stuff