wand dev r3
refactor