Version 1.6 of Assignment 2