working better now after updating lambdas