Updated final submission of Assignment4