[WIP][issue #422] implementation in progress