Added changes for assignment 3