move some ivas-only part