Corrected mapping 3