refs #8: Updated the forms.