Iteration 2 updates