Version 1.2 of Assingment 3