some work on wallet