Finalizing my changes