FIXED ALL THE THINGS