Iteration 2 stuffs updated.