CHANGED AND FIXED EVERYTHING!!!