updated the places where the struct is created #7427