MOD: minor modifications