Incorporated comments from Evan and Chris: