Updated default controller