Modifications done in assignment 7