Another rewrite