Assignment 6 fix 2.0