Rewrite (everything, but mostly Synapse)