New attempt to make course expired work correctly - not quite there yet