fixed my messed up stuff