Added changes in assignment 3