More changes I made