CHANGES FOR TOK