Update to change pointers to function calls with parameters, to lambda calls of the same