some changes on user class