New map and code for issue 4127