ARE-5986 JimSmith map