Modification according to discutions with Johan and Benoit