rewriting, little changes