Assignment 3 modified