changes to map and list