Assignment 2: updated