with fieldset changes