Organized the operator table a little bit differently