Promote 2 and X instead of Z and C