Rewrite a little