major changes to structure