working on my changes