FIX SOMETHINGS