updates for JEC and bug fixed