Rewrite for completeness