Final submission of assignment2
maybe this will work now