Changed the default behaviour to use Marc's experimental cpde... note this