New structure and rewrite