new changes from jemo diff from tombola60