opti bertran map

trying to merge our two branchs