Rewrite a few things