Assignment 3 - some updates