18 commit jj