Assignment 3.1 Update2