minor adjustments v2