updated rewrites