FIXED MORE SHIT