Massive improvement to the course