Companion integrated into the solver