use GUID instead of name
work in progress
work in progress