Changes for programming assignment 2