trying fix everything