Assignment 2 modified