Added the latest assignment 6 changes