Final changes for Assigment 2