change work structs to get less duplicates