Updated for new version of Wand