User 2 fix some changes