Hopefully all of my changes