Updated map according to Di's suggestion