changes again from jemo