Updated assignment 4