Moved JW calculation to model.terms.JW