[fix] still not working but better submission