More changes. I don't even know what I did anymore