improve IAND and WAND