add constr Count, rename old Count -> CountAll