Restored the count stuff to the plural function