Major rewrite of war provider