First round of modifications