Made changes to code for Assignment 3 additional features