update with Paul's suggestions