* moved code  in map to better place. :-)