had to fix more shit