Adding both sets of rewrites in while we work out issues.