Better map

I couldn't resist the pull request button. ;-)