Use new argument logic