old/new structs - working code - thx for pointing it out!