Updated to use the new CTP framework (Christian)

No match.