several changes, testing and lambdas