some of my changes