Changed to mutable hashmap that doesnt make tuples

Should be better, didn't profile so its a shot in the dark..