Improvement MAP Part 32