Map working better now