Added changes for programming assignment 2