Made some changes

My version is better