Performance improvement: Avoid calling count on subsequent courses