More modifications to this round of updates