Assignment 7 - initial revision