Updates from review with Cameron.