half of my changes weren't there for some reason