Rewrite again