incremental work on solver handling