Add a couple more things and remove another.