Very last modification for coupling with DSM