Removed temporary map creation -> almost 50% improvement!