Ported to new wand