Assignment 6 completion