FIXED EVERYTHING