Assignment 3: Updated