Rewrite everything again