More work on Assignment #2