little rewrite