More of my changes