Re-work to course extension support