Hi Michele, yep I agree, I talked with Luigi, my feeling is that this function is getting so complex that needs to be tested itself. We may refactor this duplication later on, maybe it's just a symptom of a bigger problem.