Future work Rewrite