Finished my changes yay