some changes 1,1