Add in returns for cancel controllers