Minor changes. Abstracting the forms.