Revert all my changes and re-edit to try fix the errors