more rewrite2