Modified Assignment 2