update to introduce dual token checking.