wrapper implemented without sets (argument order is preserved)

Signed-off-by: Kwpolska <kwpolska@gmail.com>
Merge branch 'wrapper-without-sets'