FIXED MORE CRAP