Incorporate many of Paul's comments