Modifications to CDS risk measures (need unit testing)