Another round of modifications