Slightly saner course order