cleaned up wand interface