trying to fix more stuff