Version 1.1 of Assingment 2