Ported to new version of Wand