FIXED EVERYTHING THAT WAS NOT WORKING!!!