round 2 (done by paul, but committed by greg)