Hope this doesn't break things...

there are multiple changes and I hope I don't break things...