re-org per james' doc