trying to fix eveything