Added Wand Handling code