Now conditionally adding course id