minor adjustments to rework