trying to fix everything
not sure