trying to fix everything