Corrected mapping 2