updating to implement latest FormBuilder Changes