general controllers improvments