updated guid handling