Solver rewrite
Completion