Rewrite, seems much better.