we need to refactor this : I just solved the conflicts, quick & dirty.

better naming or even re-using the same variables should be done, but at least in the meantime, a new package can be used (consider this merge as pre-release)