Extended Assignment 2