Try to make the XBees handle switching addrs better.