Modify to the version of the Udacity course