added same token feature