The rewrite is excellent