Slightly modified solver architecture.