some changes 11-7