ENH: new structure more clean
error not yet reimplemented