Try these changes to structure.