Complete the rewrite