Implemented non-token mode