Updated dump for merging into this.