big refactoring and improvement in lifting the counterexamples