--minor adjustments