Changed most of the things that had to be changed!