Changed callbacks to arrow functions