Assignment 2 Submittion v2