More changes that I should have added before