This changes EVERYTHING
some fixes