lambda and map added