more rewrites