Version 1.1 of Assignment 3