Updated FunctionCheck