map discovery
added chat
merge,1st part
merge,2nd part