fixed end wallet stuff here