Merging Bens globbing with Pauls changes.