Modified Assignment 1-4