Another round of heavy modifications.