added full token coverage