Update1 of Assignment 2