More updates from course part 1