Update after AHL's review.