rearrange fields, reduce number of required fields