Final touches for Assignment 6