Updated with completed Assignment #2