new changes from jemo