Complete assignment 6 fix