Better embedded map