More rewriting, much easier this way.