added last few changes to Iteration2