some more lambdaification