int. w/  11/26 map-api branch