Changes from Damian's review.