Completed Assignment 7 revised