changed structs to use tags