update to form generation