Assignment 2 revised