??? dealing with corruption from Nathan ???
?? merge ??