re-arrange some fields