chris_w_c 's review for:

3.0