Fixed EVERYTHING!