Put back lambda as it seems to be a best pratice.