Revisions based on emails from Raffy.