Hw 6 changes