unify both NCPs

X