Assignment 2 - some updates