JC:comment out if after wf in model.