Complete assignment 4 fix