first set of updates for xcmp