changes from jemo lappy