working version
fix more