Final changes for Assignment #5