Made a bunch on changes