I hava added some changes