Trying to fix everything