TODO added
Fixed not updated FunctionGraph