Update for rewrite