FIXED ALL OF THE SHIT
Merged