small changes on controllers