split/merge improvment in progress