Assignment 2 - updated specs