24 commit jj