Done extra credit for Assignment 4