Moved Paul's updates to their own files.