Start with a rewrite to make a better structure