Modified Assignment 3