updated controller loading