I made a few changes here