Tried to fix everything