wallet module overhauled