(*) minor adjustments