Latest Changes for Assignment 3

Done