some changes 7