MOD: minor changes