FIXED SO MUCH STUFF