fixed main mapping