[WIP][#181] scenario updated