Merged changes with updates from instructor.