Updated assignment 2