More major rewriting.