Added cdf matching among other things