Modify stuff due to Udacity.