Version 1.3 of Assingment 2