Update JF to J
merge from remote