Assignment 6 edit