Update to most recent changes from the course