Added completeCount feature