More Assignment 6