change xctool call flow