~Map Part~ Improvement MAP part 9