Added fieldset with function