...serious rewrites underway...