updated to use agile form builder code