Final additions to assignment 6.