some changes 21