add better location for list and map.