Modified to create unique token