this will need changes in the struct
this will need changes in the struct