Diffmov4

Latest update to the master including JEC