Rewrite, to make it better