updated controller selection and config