Extension to Assignment 2