More sources, rewriting