Still modifying the codes for all the structures