added some changes#4