FIXED EVERYTHING - NOTHING TO SEE HERE