Changed the things that weren't correct in the rebase