incorporate changes made by udacity