working on merging my changes