Update xIDy method, and more testing