Fixed this too, still needs some fixes