MAP-964: MORE WORK