nick complained about the form, i updated the form
merge