Fixed EVERYTRHING