jj's changes