Still trying to fix shit