working with all the changes we made