changed most maps to counters