Updated based on Toby's review.