25 commit jj