working on JEC's
sync with fork