rename fields.
add remarks.