Updated with lambdas + rename