few controller updates