added changes from jj-author