MAP-964, MAP-1036: finishing touches.