rewrite
a bit more and typo