Tweaked mapping