split, re-organize, add