added a better rework of wallet2_v2