Updated assignment 1.5