replaced delegate calls with equavaliant lambdas