some changes 3