some changes in user end