hopefully fixed everything
tried to fix everything but maybe made everythign worse