Should be final rewrite