Assignment 2 - corrected