Changes Assignment 1 to 7