revised form fields for Step Two