Fix structure and first part