Final changes, assignment 2