bugs fixed
renaming ZenTokenContext