Replacing some, adding some