Little rewrite