Implement recommendations for Iteration 2