remake_fields