minor adjustments to first two sections