Tweaking map function.