modified UserContoller 2