Switching to xctool