some changes chnaged