split related additions and some tips from DAS