SOLVERS: fk refactor