More changes, egads I suck at Git