Execution time of the Enveloping process SENSIBLY IMPROVED.
Some refactoring.