Changes to Assignment 2

This commit includes the changes done in Assigment 2