MOD: change of context definition