More finetuning on the map