changed fieldset and map