Continued proposed rewrite