Switch to new guid() method