more work on hybrid solver