Rewriting, maybe improved.