Tweak rewrite