Before merging Pete's changes.