more changes to structure