add ustun and remove cfp