MAP-854,MAP-964: more work.