integrating the functionnalities added by Douha