added new version of mac token handling