Pre-Final changes map multiple/single