Updated to Paul's sample.