Final change to rewrite