added jj is escape and save