Assignment 2: Updated from lecture