updated Assignment 2