Complete rewrite, outlining format