Issue #33: Completing the change of the contents of  the enhancement graph initiated by @luigiselmi