I added some changes :)