Update code to run on the GRID + case without JEC.