Many changes to structure