Manual mapping with the simulation is almost working with new method