Redid the structure