Lots of reference changes.