More fiddling, or should I say, re-writing.