update for cmplus+