Updated for JEC