Changes for JJ