some changes 1