Added distinct to count