Another update to rewrites