Starting minor rewrite