mapff - in progress 2