Reverting back to before FunctionTable.java