Assignment 5 modified|