Another rewrite...