Another rewrite :P