doing some changes