mapf - in progress 2