Split/add and fixes

not sure why not.  Need more explanation on what your concern is with this.