Updated with Programming Assignment 2 Changes