Add two more of Paul's suggestions