Assignment 6 Updated