I reformatted everything to try and fit his format so that the diffs would match