switch from list to map
added some info