some changes 2