I MADE SOME CHANGES