Updated assignment 7