further simplified wallet logic