minor adjustments merge