changes mostly in userTable