21 commit jj