Updated assignment 1