changed to new map fomat

all agents are compliant...