Assignment 6 Fix