map function added; add some figures;