changed over to big map, among other changes