Regressing, adding COURSEID support again