Lots of rewrites to further move toward new world order