substitute arrow functions to normal