Made some more really cool changes