A few more changes and she's all re-structured