Modifications done in assignment 6