More work on course search