switch from list to map
added some info
added some more info