Assignment 5 modified and added