Assignment 10 changes